From 26d06051211afea616d052d6b15f7b8fce9ce61d Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sat, 10 Aug 2019 13:15:51 +0200
Subject: Improved CMake generator (#4365)

---
 .gitignore                      | 1 -
 src/Bindings/ManualBindings.cpp | 2 +-
 src/CMakeLists.txt              | 9 +++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index cb520408f..f49727f3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,7 +71,6 @@ Makefile
 *.d
 *.so
 tests/*/*-exe
-BuildInfo.h
 CMakeCache.txt
 CMakeFiles
 Makefile
diff --git a/src/Bindings/ManualBindings.cpp b/src/Bindings/ManualBindings.cpp
index af4a301a0..b8827442c 100644
--- a/src/Bindings/ManualBindings.cpp
+++ b/src/Bindings/ManualBindings.cpp
@@ -24,7 +24,7 @@
 #include "../BlockEntities/MobHeadEntity.h"
 #include "../BlockEntities/FlowerPotEntity.h"
 #include "../BoundingBox.h"
-#include "../BuildInfo.h"
+#include "BuildInfo.h"
 #include "../ClientHandle.h"
 #include "../CommandOutput.h"
 #include "../CompositeChat.h"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 75eb112c0..d23fe388d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -88,7 +88,6 @@ SET (HDRS
 	BlockTypeRegistry.h
 	BrewingRecipes.h
 	BoundingBox.h
-	BuildInfo.h
 	BuildInfo.h.cmake
 	ByteBuffer.h
 	ChatColor.h
@@ -169,7 +168,7 @@ include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/../lib/sqlite")
 include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/../lib/SQLiteCpp/include")
 include_directories (SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/../lib/TCLAP/include")
 
-configure_file("BuildInfo.h.cmake" "${CMAKE_CURRENT_SOURCE_DIR}/BuildInfo.h")
+configure_file("BuildInfo.h.cmake" "${CMAKE_BINARY_DIR}/include/BuildInfo.h")
 
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 	set_source_files_properties(BlockID.cpp PROPERTIES COMPILE_FLAGS "-Wno-error=global-constructors")
@@ -368,3 +367,9 @@ target_link_libraries(${CMAKE_PROJECT_NAME} luaexpat jsoncpp_lib_static mbedtls
 
 # Create a folder for Bindings' documentation:
 FILE(MAKE_DIRECTORY "Bindings/docs")
+
+
+# For MSVC, set the startup project to Cuberite:
+if (MSVC)
+	set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${CMAKE_PROJECT_NAME})
+endif()
-- 
cgit v1.2.3